From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 13 Jul 2011 17:08:43 +0000 (-0400)
Subject: gnome-shell-jhbuild.in: Fix restore_gnome.
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8078
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=297eab738f4cdae5b66c8e43bab0a9d51a46c66c;p=gnome-shell.git

gnome-shell-jhbuild.in: Fix restore_gnome.

The gconf keys used to restore GNOME aren't in a proper GNOME3 environment.
To mimic what GNOME3 gnome-session does would be extremely complicated, so
just launch the system gnome-shell.

https://bugzilla.gnome.org/show_bug.cgi?id=654527
---

diff --git a/src/gnome-shell-jhbuild.in b/src/gnome-shell-jhbuild.in
index 924e9b386..a346f9105 100755
--- a/src/gnome-shell-jhbuild.in
+++ b/src/gnome-shell-jhbuild.in
@@ -532,7 +532,7 @@ def restore_gnome():
         component = client.get_string(gconf_path)
 
         if component == None or component == "":
-            return
+            return False
 
         # See gnome-session/gsm-util.c:gsm_util_find_desktop_file_for_app_name()
         # The one difference is that we don't search the autostart directories,
@@ -549,9 +549,15 @@ def restore_gnome():
 
         if appinfo:
             appinfo.launch()
+            return True
+        return False
+
+    # GNOME2 fallback
+    wm    = launch_component("/desktop/gnome/session/required_components/windowmanager")
+    panel = launch_component("/desktop/gnome/session/required_components/panel")
 
-    launch_component("/desktop/gnome/session/required_components/windowmanager")
-    launch_component("/desktop/gnome/session/required_components/panel")
+    if not wm and not panel: # Probably GNOME3
+        subprocess.Popen(['gnome-shell'])
 
 # Main program